Merge "GridLayoutManager: Dont crash in measure when using weight" into mnc-ub-dev