Merge "Properly cancel bugreport notification" into udc-qpr-dev