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