Merge "Settings: Allow different maximum vales for each gamma control" into cm-10.2
(cherry picked from commit 5c3da394133f6db0257c78cce00c4a74a98d7f3a)