Merge "Revert "ROMControl: Allow Custom Icon Tinting Option (2/2)"" into jb-mr1