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

Change-Id: I4da2fa6a48f0dec2637a4aa4a68214fa32365d3a