Merge "Prevent crash on uninstall." into nyc-mr2-dev