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

* commit 'fa833f466f8989f80b27ed06b31573a54544a798':
  Correctly set search string when entering search