Merge "SurfaceFlinger: fix color transfer test"