Merge "Add non null check on mViewPager" into tm-dev