Merge "SurfaceFlinger: Correct extra parent scaling with buffer transforms." into oc-dev