I haven't run in to that lately, but an issue I find much more annoying is the lack of support around re-locking with a custom root of trust. I think a few others support it, but I've only seen mention of it on the Pixel phones (and I won't buy Google hardware after they wouldn't replace my Pixel 3 that was bricked by their EDL hardware issue).