Merge "Move deferred task info logic to callback" into tm-qpr-dev