Merge "Try dismissing crash dialog." into nyc-dev