Merge "SwipeSourceDetector.source() should return SwipeSource.Resolved" into main