Merge "Fix bug 533274 - Menu key opens wrong menu in action mode"