next: ensure focus focus scope handlers are cleaned up

next: ensure focus focus scope handlers are cleaned up #2008