Merge "Fix duplicate bubbles in overflow" into rvc-dev