Merge "Account for bubble bar bounds for taskbar overflow" into main