Merge "Adding null check for task info before fetching task id" into main