Merge "Reduce the widget cell horizontal padding" into main