Merge "SurfaceFlinger: Set property in StartPropertySetThread during init am: f9b05eeb5f am: 36c08c7b8b" into oc-mr1-dev-plus-aosp