Merge "Fix view pager scroll calculation for size changes." into mnc-ub-dev