Merge change 26150 into eclair

* changes:
  Account for find dialog height in content height