Merge "Fix an issue with bubbles overlapping the taskbar" into sc-v2-dev