Merge "Improve app pairs disabled state" into main