Merge "GridLayoutManager: recalculate scrollMinMax properly" into lmp-mr1-ub-dev