Merge "Refactor communal hub enablement logic" into main