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