Merge "Delete the entire profile directory when the app is uninstalled" into nyc-dev