Clean up PWM

Seems to also fix the inconsistent navbar height slider

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