Merge CM

CyanogenMod/android_packages_apps_Settings@60c1395c818ffb47768c2da79dbb38730f8ef828

Signed-off-by: Arnav Gosain <nolinuxnoparty@gmail.com>