Merge "Fix crash dialog for TV"