Revert "UI change w/o reboot and navbar height"

This reverts commit 45a0ad9ef77e8f70f1d6ce12b8c6b05399f2b053.

Conflicts:
	core/java/android/provider/Settings.java