Merge "Fix the fix of view pager scroll calculation for size changes." into nyc-dev