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

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