Merge "Merge "Fixed null callback issue" into qt-r1-dev am: f3395734e8 am: d084c899d9" into qt-qpr1-dev-plus-aosp