Merge changes from topic "on_unavailable_fix" into qt-dev

* changes:
  [CM] Fix NPE due to unvalidated callback value
  [CM] Fix NPE due to unvalidated callback value