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