Move show/hide power menu option below automatic lock
Slider based font size control

Conflicts:
	src/com/android/settings/DisplaySettings.java