Merge "Using icon resource instead of icon bitmap in task description"