am 3e405f3a: DO NOT MERGE. Save keyboard layout only when it is shown

* commit '3e405f3afd9bf5c5978d05c07dc186e862885f78':
  DO NOT MERGE. Save keyboard layout only when it is shown