Merge "Fix a SurfaceFlinger bug."