Merge "Fix bug with app pair 10:90 launch" into main