Merge "Change surfacefliger properties scopes to public"