Merge "ROMControl: Clean-up && RemovePrefs" into jb-mr1