Merge "Update SurfaceFlingerProperties scope"