NavigationBarView: correct hidden legacy menu visibility behavior

the menu key was changing into the layout changer when no additional layouts
were enabled which threw things off

Change-Id: I00f33669688b4da295bdda93d0ec91a655cbeee6
Merge "NavigationBarView: correct hidden legacy menu visibility behavior" into EXODUS