Merge "Fixed null callback issue" into qt-r1-dev