issue #5176, refactor FocusNavigationController
Merge pull request #6901 from andyque/fixDpadNavigation

issue #5176, refactor FocusNavigationController