Merge "Fix multiuser freeze-kills" into main