Merge branch 'jb43' of https://github.com/ParanoidAndroid/android_packages_apps_Settings into jb43-legacy