Merge "Ensure only one context menu is shown at a time"