Work on focus trap.

Closes #3443571

Merge request reports

Loading