am 1f1638d6: (-s ours) am a4944dff: Fix NPE in Key.isDigitPopupCharacter (DO NOT MERGE)

* commit '1f1638d62b0058237dffd4524471528ed8c0efe6':
  Fix NPE in Key.isDigitPopupCharacter (DO NOT MERGE)