Merge "Add aconfig flag for enable_app_pairs" into main