Merge "Address exception thrown by PackageManager for newly installed app" into main