Merge "Use aconfig flag for communal hub" into main