am 66964ca7: am fa833f46: Merge "Correctly set search string when entering search" into lmp-mr1-dev

* commit '66964ca7dd73ec496bbd1435d51a8cb5aa0f4be9':
  Correctly set search string when entering search