Merge change 23445 into eclair

* changes:
  When removing a tab, go back to the correct parent tab.