Merge change 25013 into eclair

* changes:
  Various fixed for back key handling.