am 57830506: am dcc46652: Merge "Simplifying search bar animations. (Bug 6529767)" into jb-dev

* commit '57830506bf4fbd7e9093510223ae9b43e4047f7f':
  Simplifying search bar animations. (Bug 6529767)