am 6b09aad7: Merge "Fix SearchView\'s hint selection - support edition" into lmp-mr1-ub-dev

* commit '6b09aad7f5533c9c02cc4447f8e5fc98986aa8d1':
  Fix SearchView's hint selection - support edition