Merge "Migrate ENABLE_APP_PAIRS flag to aconfig" into main