Merge "Do not postpone draw transaction" into tm-qpr-dev