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