Settings: Restore functionality of reset in colour and gamma hardware tunables

Change http://review.cyanogenmod.org/#/c/50147/1 introduced a requirement that the user
manually change slider settings in colour and gamma controls before the values would write
to file, breaking the reset behaviour.

Change-Id: I5049631d2fa2a8d3553e8d56f49dc59770ecd6fb
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2