Merge "SurfaceFlinger: fix early latching of buffers"