Fix last merges
Merge branch 'JB-4.2' of github.com:Nexus-Evolution/android_packages_apps_Settings into JB-4.2