Merge commit '65582531' into gingerbread

* commit '65582531':
  Fix a bug in backspace handling for the "Tap again to save"