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