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