Merge "Fix grid previewing so it matches the applied layout" into main