Update WP Zero hint in SearchView, and a bit of cleanup.

Change-Id: I64fa6b72269ca05a1524072b6ea9b4210acd9ad1