Merge "Add missing pm.* properties in property_contexts"