Revert "Fix scrollbars appearing out of place in Superuser."

This reverts commit e63ebe1b69c06e11aca6974bc4bf7b7941002f94.
Revert "Switch to new Superuser"

This reverts commit 432df664f4ff1c899ccede39dcd16a8e92e196a6.
Fix for ElectronBeam commit
settings: add scale down crt animation - thanks a ton to xploidwild

really nice idea...fits perfectly into our animation options
for CRT

reword the different modes

Change-Id: I07a32b4cbfe956010507f5c8eddc92c2df395815

Conflicts:
	res/values/slim_arrays.xml
	res/values/slim_strings.xml
Merge branch 'kitkat' of github.com:ModdedPA/android_packages_apps_Settings into kitkat
Merge remote-tracking branch 'upstream/kitkat' into kitkat