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