Merge "Fix crash in ManageKeyboard screen in TvSettings."