Merge "fix extra browse backstack entries"