Merge "Delete bugreport file on bugreport cancel" into rvc-dev