am a78bdd95: Merge "Fix 6578735: don\'t crash system ui when there\'s no search activity" into jb-dev

* commit 'a78bdd95b30ecdbd26e1b46c0d651b3975fea6b8':
  Fix 6578735: don't crash system ui when there's no search activity