Merge "Fix a bug where context menu keeps popping up as we move cursor." into nyc-andromeda-dev