app-shell: preserve the "extra" path components when changing the routing state

In case the current language changes or the current activity is re-selected in the
menu we don't want to lose the extra trailing path components.