am b98eb1d0: am 487de5d1: Merge change I74688835 into eclair

Merge commit 'b98eb1d07b9c8eeaa7f57408dd2448af47778a6a' into eclair-mr2-plus-aosp

* commit 'b98eb1d07b9c8eeaa7f57408dd2448af47778a6a':
  Account for the gap at the top of the search widget when animating