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

Revert submission 30598118-grid_layout_fix

Reason for revert: b/381973672

Reverted changes: /q/submissionid:30598118-grid_layout_fix

Change-Id: I2e6445e248afe9c0a6e58d23e9faa983b3864007
3 files changed