Merge "Change app crash dialog strings" into nyc-dev