Merge "Improve ANR dropbox reports" into nyc-dev