Merge "GridLayoutManager: fix scroll bug" into lmp-preview-dev