Thanks for responding regarding the flickering issues. I can't reproduce so will continue building for myself with the patch.
I totally understand the revert since given the reported issue it makes sense. Worth noting that with the patch some users could confirm that 4:4:4 was being used from AVR or TV info.
Thank you for the build and support as usual.