Merge "App Pairs: Implement app pairs icon" into main