Merge "DO NOT MERGE ANYWHERE. Fix the fix of view pager scroll calculation for size changes" into mnc-ub-dev