Merge "Fix app pair launches with certain apps" into main