heads up: Merge latest CM changes:

Remove unnecessary padding from HeadsUpSettings:
https://github.com/CyanogenMod/android_packages_apps_Settings/commit/ae79ee48c7103785c59d58a11ac62936efedc412

Fix heads up action bar switch handling for tablets:
https://github.com/CyanogenMod/android_packages_apps_Settings/commit/39bb846fe01c557e162ff26804b37612855ef325