Merge "App crash dialog polish"