Regression: Clicking hamburger 2nd time closes menu

This was broken by the introduction of the navigation drawer

Change-Id: Ib2860b2b45affb105aba590025bdd64ace6b3328