Merge "Update usage of deprecated coroutines methods" into tm-qpr-dev