Navbar height fix

Change-Id: I1fc9f1af7ed4aedee0929f8e8be1ddde71698ae6

Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java