am 1c3d36ec: am 678b4c20: Merge change 25013 into eclair

Merge commit '1c3d36ec6c3ed111e43d41e59d0ac1e740972dc1'

* commit '1c3d36ec6c3ed111e43d41e59d0ac1e740972dc1':
  Various fixed for back key handling.