Merge "Add ro.surface_flinger.display_primary*"