Merge "Fix jank when rotating an expanded bubble" into main