Merge "ROMControl: Remove Needless Preference" into jb-mr1