Merge "SurfaceFlinger: Fix triple buffering variable naming confusion"