Fixes from Nav Bar Tweaks commit.

Change-Id: Iebacb620d17f2e5b3e5ff20cd465ec92064f11ad