am 9ff71d38: Merge change 7940 into donut

Merge commit '9ff71d38a060476ba19deacf12ddaeef3cbac00d'

* commit '9ff71d38a060476ba19deacf12ddaeef3cbac00d':
  whoops, still need to dismiss when launching an intent for in-app search