Bring user settings inline with cm
Change-Id: I0128d57a5a46e87fe414a2682847ff877d8b1428
Get rid of display gamma and color tune
Merge commit '749e640' into jellybean