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

Change-Id: I438b53eec3edf8de1f9046ea820f7fdfd17f4249