Merge "Reset color space when development options are disabled" into lmp-dev