Merge "Refactor buildPrevNextNavigation"