[automerger skipped] Merge "[CS] Unregister callback as part of onUnavailable dispatch" into qt-dev
am: 8961a1728b -s ours
am skip reason: change_id I4c54b003a733eb0b1e4fd8674ed13081b1bef8e3 with SHA1 9b09a16930 is in history

Change-Id: I3a61f64da1fc5d376da06a81ce8a35bac09d4481