Merge "GridLayoutManager Fix child state restoring bug" into lmp-mr1-ub-dev