Merge "Do not start drag from pre-drag if cancelled during animation." into tm-qpr-dev