Merge last change of 'https://github.com/CyanogenMod/android_packages_apps_Settings' into 'cm-11.0'

Change-Id: I1b026b0713ad4ef3d3291797adf459c625b355bb