Shortcut show/hideSearchBar with new conditions.

This is effectively a revert of:
https://googleplex-android-review.googlesource.com/374556

With the new rules, we won't shortcut if:
 - the search bar is in an opposite visibility OR
 - a non-animated change has been requested AND there
   is an ongoing animation.

This makes sure that showSearchBar(false) called after
showSearchBar(true) is not ignored.

Bug: 11105305
Bug: 11237729
Change-Id: I92668dfac072e62506b2872e8bfbe9f707c9cc69