More fixes

Change-Id: I00fab51c3619d0d5e7860a97ded6910accc8d027
Merge https://github.com/BeerGang/android_packages_apps_Settings into cm-10.1