Merge "Snap to saved app pair" into main