Fix for #8379.
Fix for #8427.
Fix for #8428.
Fix for #8430 plus various dark theme tweaks.
Merge pull request #8429 from adobe/larz/tiny-s42-fixes

Tiny Sprint 42 Fixes