am e895db8f: am e7fecbc5: (-s ours) am 3e405f3a: DO NOT MERGE. Save keyboard layout only when it is shown
* commit 'e895db8ff636c6c32671f07d04b81b0663ed2cf1': DO NOT MERGE. Save keyboard layout only when it is shownmain
commit
910655de0b