Merge "Stop de-selection when drag and drop starts." into nyc-andromeda-dev