Merge "Improve multi-user consistency in onFinishPackageChangesInternal()" into main