Merge "Catch exceptions from prepareUserStorage() in loadPrivatePackagesInner()"