Merge "Align Bubble with Expand Icon" into rvc-dev