Merge "Add log to NoMan for canceled cancels"