Merge "Fix SuspendPackageHelperTest after Kotlin 1.7.20"