Merge "Fix flakey unit test" into tm-qpr-dev