Merge "Finish drag when cancel transaction is aborted" into main