Merge changes I3ac6506a,I3fc80505

* changes:
  Add intent-filter to SearchResultTrampoline
  Create a feature flag for Search v2.