Merge "[CS] Unregister callback as part of onUnavailable dispatch" into qt-dev