Merge change 7940 into donut

* changes:
  whoops, still need to dismiss when launching an intent for in-app search