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

This reverts commit 7afceafa341103afab5cecff78056cc3006eca2c.

Conflicts:

	core/java/android/provider/Settings.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java