Merge "Fix crash with app pairs and grid migration" into main