Fix crash related to ViewPager code update

Change-Id: If7b77f01d5d9aadafdc137886a001af94dea7ba1