Merge "Don't crash in background after app uninstall." into oc-dev