Rework notification light settings(2/2)
Clear All button added in Recent Panelview (2/2)
Add a circlular memory indicator to the recent panel view (2/2)
Hide unsupported tiles
- added missed drawable
Added Expanded Desktop Tile

Conflicts:
	res/values/oct_strings.xml
	src/com/android/settings/quicksettings/QuickSettingsUtil.java
[2/2] Settings: Add lockscreen ring battery setting

Change-Id: Ia07ecc1feedee71b8ea217c53244fdef9ff1bc18

Conflicts:
	res/values/custom_strings.xml

Conflicts:
	res/values/gummy_strings.xml
Active display [squashed](2/2) & revamped Oct Settings menu

Change-Id: If15f748a9bb8ad3b82d7b9944b0b456fdbabd9fe

Conflicts:
	res/values/cr_arrays.xml
	res/xml/screen_and_animations.xml

Conflicts:
	res/values/cr_arrays.xml
	res/values/cr_attrs.xml
	res/values/cr_strings.xml
	res/xml/general_settings.xml
	res/xml/screen_and_animations.xml

Conflicts:
	res/values/pac_strings.xml
	res/xml/settings_headers.xml
Re-implemented app sidebar

Change-Id: I594ff26596e84eb5641005ff391915d60662b050

Conflicts:
	AndroidManifest.xml
	res/values/pac_arrays.xml
	res/values/pac_strings.xml
	res/xml/system_ui_settings.xml
Display Settings: Better font size control

Use a SeekBar instead of a list/spinner to determine the font scaling.
For consistency, an approximate size (small, normal, etc.)
 and the exact percentage are displayed.
Show a preview of the selected font size immediately

Ported from CM 10.2, squashed commits 46678 and 49167.
Credit to Veeti Paaananen for the latter commit.

Change-Id: I754d7fdcaf27c23dfccf9d56291956e70b23f63e

Conflicts:
	res/values/cm_strings.xml

Conflicts:
	res/values/attrs.xml
	res/values/cm_strings.xml
	src/com/android/settings/DisplaySettings.java
Status bar brightness control

+ added some fixes to original implementation (thanks mostly cm for that)
+ add multiuser support

Conflicts:
	res/values/gummy_strings.xml
Fixed battery icon(2/2)