Initial commit fixes flash of unstyled content and the issue where the toolbar is styled when the toolbar setting is off.
Closes #3467210