issue #5176, refactor FocusNavigationController