Merge "Fix SearchView's hint selection - support edition" into lmp-mr1-ub-dev