Merge "Fix communal widget sizing" into main