Final cleanup
Merge branch 'jbam10' of github.com:BAM-Team/android_packages_apps_Settings into wip-jbam10