Merge branch 'android-4.4' of https://github.com/omnirom/android_packages_apps_Settings into android-4.4