Strip whitespace from search value

Bug:839888
Merge "Strip whitespace from search value" into develop