Merge "Dump when in bugreport"