am b050b458: am b8893c04: am d4662983: Fix restore from keyboard automerge: e551539

* commit 'b050b458dc1eac06412d116d6b57b849d3ccb06d':
  Fix restore from keyboard