Merge "SurfaceFlinger: Revert accidental change" into sc-dev