Fixing potential issue with wrong task descriptions being loaded.

- Also cleaning up the Task to remove some confusing nomenclature
  related to task properties.  Now there is a single icon and title,
  and we keep a copy of the TaskDescription for future icon loading.
- Also changing a few cases where we should be calling isFreeformTask()

Bug: 26221779
Change-Id: Iac20cc7b4912f76c14232a323981ab2e8f62628a