Merge "Fix issue with drags sometimes not being handled in tests" into tm-qpr-dev