Fix more derps in Navigation Bar Height Implementation

Change-Id: I48e3cb28e05e4e39b9090f281a7917a6873879ec