Merge "SurfaceFlinger: Change to support client target flip"