Merge "Use translation to move bubble bar during bubble drag" into main