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

Change-Id: Ib05d3f19b1c01f3df5d833153494b861c4cfeac1