Merge "Add aconfig for text flags" into main