Merge "Always collapse expanded view when dragging a bubble from bubble bar" into main