WIP PEEK 2/2
Merge branch 'kitkat' of github.com:X-ROM/android_packages_apps_Settings into kitkat