Original PR: #2001

Is your feature request related to a problem? Please describe.
Due to time constraints, the team has not yet investigated alternative ways to ensure that focus trap works for all OSes. To be clear, the above PR fixes the broken focus trap problem, but it would be great if we can find a fix that doesn't depend on the OS.

Describe the solution you'd like
Get focus trap to work with code that is not dependent on the OS.

Describe alternatives you've considered
The above PR is already a working fix. Just wondering if there's any optimizations we can make. :)

Additional context
This is related to accessibility.

[enhancement]