Merge commit '17dc363a' into gingerbread-plus-aosp * commit '17dc363a': Fix an NPE found in KeyboardSwitcher.isAlphabetMode()