Track renaming in the ADS to keep selection in the dock. Re #8032
Merge branch 'bugfix/8032_dock_loses_selection' into develop