Re #8908. Catch and handle the Rename notification.
Merge remote-tracking branch 'origin/bugfix/8908_instrument_view_exception_after_rename'