Allow different maximum vales for each gamma control.

Change-Id: I263976d442c2754d46bfad76a795dba3152d820e
Merge branch 'cm-10.2' into martincz