Merge "Move page count to rememberPagerState" into aosp-main-future