Merge "Migrate to aconfig flags" into main