Merge "Merge public/property_contexts into private"