Merge "Fix NPE in ActivityRecord" into qt-dev am: abb606c5bd
am: 8da909ff3b

Change-Id: I86c9c01ef01884180570032e10c555429dad3841