Merge "Transition tests - Mark flaky" into tm-qpr-dev