Merge "Fix bubbles manage button touch target" into main