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

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