Merge "GridLayoutManager: fix focus lost in fast layout" into lmp-mr1-ub-dev