Merge "Prevent search crashes from uninstalled apps" into oc-dev