Merge "SurfaceFlinger: Rework buffer latching when removing from current state"