Merge "Don't crash during app uninstall." into oc-dev