Merge "Do not reference TaskRecord's intent without checking for null." into pi-dev am: a16cc4215a
am: 9d9dcadfef

Change-Id: Ia0fb7215e02d9aa4d62e0f20376f328e1d20f626