Merge change 26587 into eclair

* changes:
  Back button in search always goes back or closes search