MDL-40344 navigation: expandable branch id is now properly unique