Merge "Fix more kotlin 1.7.0 errors" into tm-qpr-dev