Merge "Remove observer when QSBH is detached" into rvc-dev