Merge proposals dependent on lp://qastaging/~unity-team/unity-lens-applications/global-search-fixes

1. global-search-fixes
2. Dependent merge proposals