Show home-as-up icon instead of hamburger when searching.

Also added one more case for ensuring visibility of the ActionBar.

Change-Id: I3aeeb68b57d5624d22a9aa460bd1f7670da75a48