Merge "Fix duplicate bubbles in the overflow" into sc-dev