Merge "Ensure Bubbles get removed at the end of the test" into tm-qpr-dev