Add some code to look up which window to target when interacting with a dockable.
Merge remote-tracking branch 'origin/master'