Merge "GridLayoutManager: handle smoothscroller cancellation properly" into mnc-ub-dev