Merge "Guard against menu onclick being called twice"