Merge "Mark BubblesTests as flaky" into tm-qpr-dev