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

Change-Id: I2811b36c1e17e268943dd35fc4a4707cd0dc1baa