Merge "Change onTaskInfoChanged to only use display id from task info." into tm-qpr-dev