Yes, to some extent, I've got some request from devs for such an issue.
There is already handling of a bit more complicated case in the same handle_syscall_trap() so I hope its fine. Also, I've included the test which confirms the behaviour (while it looks rather apparent anyway, user mode set traps can't be affecting the kernel, even while real kernel will deal with user-mode set HW traps in a different way).