Merge "Revert "Fix the layout of the grid option customization (2/2)"" into main