Merge "Revert "GridLayoutManager: fix bug if current focus is on top of grid view"" into klp-modular-dev