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

Change-Id: Ic4eb6778fe456a8da4deb4d58e69ffecc9023a96