Just now, an iTerm2 update arrived that fixes this exact issue for me.