Navbar: Legacy menu key toggle

PS2: restore checkstate on reentry and whitespace

Change-Id: I8c331663897d13bebf34718157dc1a257382fdb7
Merge "Navbar: Legacy menu key toggle" into kk44