Merge "Fix BackNavigationControllerTests failure" into main