Merge "Add ability to show/hide Color Correction and Color Inversion."