Fix merge
Merge branch 'kitkat' of github.com:ModdedPA/android_packages_apps_Settings into kitkat