Merge "Wait for bubbles to be loaded in BubbleDataRepositoryTest" into udc-qpr-dev