Merge "property_contexts: Drop COMPATIBLE_PROP guard"