New logic for showing/hiding menu items.

Fixes b/8905351.

Change-Id: I69696f478940f14e9ab22d43f893520dfac4ccef
1 file changed