Merge "Enforce rounded corners for communal widgets" into main