Merge change I8d48149c into eclair

* changes:
  Don't reinflate search bar when dialog is already showing