Merge v4.2.1 feature branch into master

[tonyanziano]

I rebased to clean up commit history.

[coveralls]

Pull Request Test Coverage Report for Build 1593

• 77 of 82 (93.9%) changed or added relevant lines in 5 files are covered.
• 2 unchanged lines in 2 files lost coverage.
• Overall coverage increased (+0.2%) to 57.607%

---

Changes Missing Coverage	Covered Lines	Changed/Added Lines	%
packages/app/main/src/appMenuBuilder.ts	58	63	92.06%

Files with Coverage Reduction	New Missed Lines	%
packages/app/main/src/utils/getThemes.ts	1	90.0%
packages/app/main/src/utils/loadSettings.ts	1	79.07%

Totals
Change from base Build 1583:	0.2%
Covered Lines:	4867
Relevant Lines:	7598

---

💛 - Coveralls