Restore selection after dock updates. Re #8032
Track renaming in the ADS to keep selection in the dock. Re #8032
Merge remote-tracking branch 'origin/bugfix/8032_dock_loses_selection'