Merge "Setup GridLayoutManager state before scroll" into mnc-ub-dev