Merge "Revert "Revert "[SurfaceFlinger] Remove force GPU composition for layers with color transform.""" into qt-dev