Merge "Fix bubble visibility issue when collapsed" into main