Bug 956858 added code to not show menus when the phone is in editing mode. This led to the strange circumstances where hardware menu buttons work if your screen looks like: http://dl.dropboxusercontent.com/u/72157/menu1.png but not if it looks like: http://dl.dropboxusercontent.com/u/72157/menu2.png which leads you to think we're broken. I'm not even sure the designs in bug 965548 would fix the broken feeling but Ian gave the go ahead to do that or back this out. Filing a new bug for this so its easier to track uplift.

backout patch

Comment on attachment 8377925 [details] [diff] [review] Patch [Approval Request Comment] Bug caused by (feature/regressing bug #): 956858 User impact if declined: Confusing behavior of menu Testing completed (on m-c, etc.): Landed on mc today. This is a backout though. Risk to taking this patch (and alternatives if risky): Low risk. String or IDL/UUID changes made by this patch: none.