Merge "Update bubble bar swipe logic" into main