Merge "Responsive grid cleanup" into main