Merge remote-tracking branch 'upstream/jb43-legacy' into jb43-legacy-alt
Merge branch 'jb43-legacy-alt' of https://github.com/alteredlikeness/pa_android_packages_apps_Settings into jb43-legacy-alt