Merge "Setup aconfig for communal" into main