Merge "Fix crash in KeyboardView with null Handler"