Merge "Prevent NPE when dragging last bubble from expanded state" into rvc-dev