Merge "Update internal ViewPager's SavedState to match Support Library version"