Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0-sgt7

Conflicts:
	res/values/cm_strings.xml
	res/xml/performance_settings.xml