Merge "Fix possible NPE in MainKeyboardView"