Merge "Avoid CalledFromWrongThreadException in BubbleController" into main