Merge "Add test that quick switch on pair-to-pair should never enter pip." into main