Merge "SurfaceFlinger: Inherit non-transform Scaling from parent." into oc-dev