Merge "Add overload for setupWithViewPager()" into nyc-dev