Merge "Fix bugreport warning dialog"