Merge "Reorganize aconfig flags" into main