Merge "SurfaceFlinger: Fix check for ignoring a new color transform" into qt-dev