Merge "Allow app pairs in folders" into 24D1-dev