Picked all changes in betwenn April 12 and May 29

I started exactly after: 62576d1aa30e36dff27730d91fd71c1588892bcd

So far only skipped translations and as I have mentioned to you:
- https://github.com/CyanogenMod/android_packages_apps_Settings/commit/6075fb6977133fb1ded24900bc8e16392f7ca233
- https://github.com/CyanogenMod/android_packages_apps_Settings/commit/d884fdeb9b9318c0942b0ea48bfca789fb15b781 (obsolete because I have copied the entire xml file in aprevious commit
- https://github.com/CyanogenMod/android_packages_apps_Settings/commit/0297b9c9621ea049b4e9af04eae70283f2a65e44
- https://github.com/CyanogenMod/android_packages_apps_Settings/commit/6dd859507c80937ccd5dc2d221ffbcc9e4d077a2 (cherry-pick failed; already present n AOSB)
- https://github.com/CyanogenMod/android_packages_apps_Settings/commit/de3d953f07fb3e7a86582e01d0e67dfe1e5b15bb (conflict: not sure if this commit is desired)