Merge "Fix bug 5154361 - New force close dialog text breaks button order rules"