Merge "surfaceflinger: Set correct initial value for mActiveColorMode"