Merge "Remove gamma correction from color correction shader" into mnc-dev