Merge "Use mock window manager for BubbleController in tests" into rvc-dev