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

Change-Id: I13629ef2b8115381ebbe2438e4d68072fad5cfdc