Merge commit '6511376f' into gingerbread-plus-aosp * commit '6511376f': Fix a bug in backspace handling for the "Tap again to save"