Settings:Power Menu Config & Immersive Mode [2/2]
Settings:Network Activity
Status bar activity indicators settings

Conflicts:
	res/values/purity_strings.xml
	src/com/android/settings/purity/StatusBar.java
Cleanup

Conflicts:
	res/values/config.xml
	res/values/dimens.xml
	res/values/purity_strings.xml
	res/values/ras_arrays.xml
	res/values/ras_config.xml
	res/values/ras_dimens.xml
	src/com/android/settings/rascarlo/PowerMenu.java
Revert "Cleanup"

This reverts commit 769dfded6eaa3eae443fa40e089e3a69a4d3c932.