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

Merge commit '1216caaf0e1f998b55d1019b1510ddd8f653af72'

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