I have the same setup with an X1 G9 and Thunderbolt 3 dock Gen 2 and I tried to update as well and ran into the same DP issue. I ran through this entire chat and tried to do all the things recommended but now my main displayport screen constantly flickers.