Merge "Convert mHistory to mTaskHistory (5)"