Merge "Remove property_area_initialized"