Merge "Fix bubble position when dragged to dismiss view" into main