Merge "refactor(aconfig): Change the order of the flag to keep alphabetized" into main