Merge "Call prepareAppDataAfterInstall without mPackages lock" into nyc-dev