Bug GPU lightmapper stuck preparing bake for moving Shader Graph shaders (vertex offset)

We just upgraded to 2021.3.24f1 because of some bug fixes that are important to us. However, GPU lightmapping doesn't work to bake Shader Graph materials with vertex offset movement. The movement is tiny and just to create an effect, so the objects can be static and baked. This worked just fine in previous versions, but now it's stuck preparing the bake.

Is there any other way than to remove any vertex offset during bake and then enable it again? I know it may seem like an edge case, but these small moving effects are important to the art style and we can't just disable and enable it in every shader every time we want to bake.

EDIT: Okay, it doesn't seem to be limited to vertex offset movement, but also if the emission map is dynamic, so one has to freeze the emission map for every bake.

 

the bake works if you close both scene view and game view.

Hope there will be a fix soon for 2022.2.x