Merge "SurfaceFlinger: Correct logic error in early release" into tm-dev