Revert "Trimmed the branch to only the grizzly_navigation sub directory"

This reverts commit 4c99a3207b346b9e72f61a83a5c4ec62654cbfaa.
Rebase from 'upstream'
Trimmed the branch to only the grizzly_navigation sub directory