Hi, I've pushed a fix for this as commit 49375f83fc. The tests I've implemented to help troubleshoot the issue are up for review in https://issues.guix.gnu.org/74151.
I haven't yet reconfigured berlin with it but will do so next night, European time. A fully functional reboot at last awaits :-) -- Thanks, Maxim