Remember correct search panel when exiting/reentering search.

Bug: 73579
Change-Id: Iaa69891b9dbccf1ff2518840799af25e1550508c