Merge "Migrate Bubbles to wm-shell (1/n)"