Merge "GridLayoutManager: fix some animation jumpiness" into lmp-preview-dev