Merge remote-tracking branch 'github/cm-10.1' into HEAD
Recents Panel Enhancements (2/2)
Credit: Team EOS

Change-Id: I845d83f71c753845f7f74c873448b699ce26d6a7

Conflicts:
	res/values/strings.xml
	res/xml/system_settings.xml
	src/com/android/settings/xperience/SystemSettings.java