Merge "Remove line between bubble bar and arrow" into main