Do not show conditional menu in Navigation Bar when it's there persistently

Change-Id: I8ed562befbdad58d6b2cc80de39b098fdb38115b