base

Fix bug 5198868 - Showing previous hidden options menu doesn't work

Fix bad assumption in flagging action items.

Change-Id: Ic67b56195bc308e73d1564cbf1b77e41eaa4ecab