Fix broken key-type to search with keyboard

Remember the query text before updating the SearchView,
and restore it again after the update is done to prevent
the loss of the first typed character after going into
search mode.
Bug: 6332454

Change-Id: I2f6eb930cbbeef57c61e830e048a40295e07df30