Merge "Remove some blocking calls in BubbleManager" into sc-dev