Merge "[SurfaceFlinger] Fix color mode switch." into pi-dev