## PR description:

_From the perspective of the reviewer, what context do they need to know to understand this PR?_

- Background information:

- TODOs not included in this PR:

- Testing information:

- Relevant links:


## Checklist:

As part of our commitment to engineering excellence, **before** submitting this PR, please make sure:

- [ ] You've tested this code in both Desktop & Service mode (**functional testing**).
- [ ] You've added **unit tests** for new code.
- [ ] You've added **e2e tests** (if appropriate). 
- [ ] You've added documentation to our Wiki / product pages. Please include a link to this. (Ensure that any implementation notes that would be helpful to future engineers are included.)
- [ ] You've reviewed the PR/code best practices defined [here](https://microsoft.visualstudio.com/DefaultCollection/SME/_wiki/wikis/SME.wiki/65872/Git-Azure-DevOps).

In addition, **after** this PR has been reviewed, please agree to:

- [ ] If changes have been made to your PR in the process of addressing comments, please make sure to test the _final_ version in both Desktop and Service mode again.
- [ ] Validate your change in the official build the following day.

