navigation bar enablement fixes

Change-Id: Ic567f565013c504e2fadba95519a9959408104a2