Merge "Simplify crash dialog" into nyc-dev