Added a fix for a bug that allowed the primary content to be navigated to using the cursor keys on the keyboard.
The control was also updated so that the last focused control is restored when the modal content is hidden.