am e7fecbc5: (-s ours) am 3e405f3a: DO NOT MERGE. Save keyboard layout only when it is shown

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