am d4662983: Fix restore from keyboard automerge: e551539

* commit 'd4662983d87d6d2ef2361e9053a29d6e5fb8d16e':
  Fix restore from keyboard