Merge "Refactor UserProfilePager" into main