Merge "Merge "Fix exception of unregisterCallback when callback is not registered" am: 43b75cad am: d526de2c" into qt-dev-plus-aosp