Merge "Fix user for InstallSessionHelperTest HSUM failures" into main