Merge "Allow canceled draws to get retried for sync" into tm-qpr-dev