Merge branch 'kitkat' of github.com:AOSPA/android_packages_apps_Settings into kitkat