Merge "Convert mHistory to mTaskHistory (3)"