Merge "Fix NPE in ActivityRecord" into qt-dev