Merge "Update for ViewPager changes"