Merge "No-op refactoring of ViewPager and Adapter setup to new helper class" into sc-mainline-prod