Merge "[SurfaceFlinger] Fix color mode switch." into pi-dev
am: 03eebddfca

Change-Id: I92227e83173874feca2d6e3fc01cbdc72e1bb76c