Merge "Fixed null callback issue" into qt-r1-dev
am: f3395734e8

Change-Id: If431a32bf6a44235599737b0295d2bb1cf491acf