Merge "GridLayoutManager: new method signature" into klp-modular-dev