Merge https://github.com/AndroidOpenDevelopment/android_packages_apps_Settings into HEAD