Merge "Fix ViewPager margin drawing for cases drawAt < 0." into nyc-dev