Merge "dumpstate: add dropbox crashes to bugreport" into oc-dev