Merge changes from topic "yukawa-b66498367" into pi-dev

* changes:
  Revert "Switch and store keyboard layouts based on IME subtype."
  Revert "Accept null subtype in InputMethodSubtypeHandle."