Merge change 25362 into eclair

* changes:
  Handle BACK key with focus in search ACTV correctly