Merge "Step down icon size when isVerticalBarLayout for responsive grids" into main