Merge "Wait for bubbles to dismiss after teardown" into udc-qpr-dev