Merge "Convert mHistory to mTaskHistory (7)"