Fix Android 4.3 Merge
Merge branch 'jb-mr2' of https://github.com/ReVolt-ROM/packages_apps_Settings into jb-mr2