DONT MERGE - special handling of navbar menu key

Change-Id: Id53860ee720c6965104a8d1e5c04873506fbde26