Merge "Allow app pairs in folders" into main