Fix bug 3312949 - inconsistent state in MenuPopupHelper Change-Id: Ie802ada3f8de4cf71c92fcc7c6abce9ba85e7b75