am 98aa4761: Merge "Shift + smiley key become return key"

* commit '98aa47613149ad9c56f8e01ae1669bb9a34fdbd4':
  Shift + smiley key become return key