Merge "Add log to NoMan for canceled cancels" into rvc-qpr-dev