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

Change-Id: Ia8b8c40c795ef02293dc1fb06bb973598ca7f6ed