Fix derps in Navigation Bar Height implementation

Change-Id: I290bbb2556a7734262dfbb449e3a1aa1c8c3f65d