Revert "[1/2] Additional settings: add option to hide power menu when screen is locked"

This reverts commit faa14d4e422eae287077ad56afe7e5d4b74c6c85.

Conflicts:
	res/values/pa_strings.xml
	res/xml/additional_settings.xml
	src/com/android/settings/AOSPAL/AdditionalSettings.java
Revert "Return: Always show battery on Keyguard [2/2]"

This reverts commit 2f04b6f82d016e961d4624d61ebc3288bc07e638.

Conflicts:
	res/values/pa_strings.xml
	res/xml/lockscreen_settings.xml
	src/com/android/settings/AOSPAL/LockscreenSettings.java
Remix Settings: Set it's icon on the ActionBar
Remix Settings: Add bugreport to the action bar
Update some icons

-Add icons to screen recorder and blacklist option
-Replace kernel tweaker icon with the new one

All credits to Enrico!
Remove this, it was actually a test
Remix Settings cleanup
Merge remote-tracking branch 'settings/remix-staging' into legacy-staging

Conflicts:
	res/values/psd_strings.xml
	res/xml/display_settings.xml
	res/xml/system_settings.xml
	src/com/android/settings/AOSPAL/LockscreenSettings.java
	src/com/android/settings/DisplaySettings.java