Merge "Add null check to precent crash in monkey test" into qt-dev