Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.2

(cherry picked from commit 58e088ffaf7a06feaa45826790d768eb1431a2cd)