cherry picked nothing
added SubNavigation component
Remove obsolete SubNavigation