Merge commit '288cdf822559af1b3ba22d6271d5fae8ae98b077' * commit '288cdf822559af1b3ba22d6271d5fae8ae98b077': Various fixes for back key handling.