Resolve #3341110 "Toolbar is colored when toolbar integration is off"

Closes #3341110

added 22 commits

• fb296ea2...520137b4 - 21 commits from branch project:4.x
• 0068b745 - merge upstream changes

Compare with previous version

added 3 commits

• 0068b745...758481f2 - 2 commits from branch project:4.x
• 15129e92 - Merge branch environment_indicator:4.x into 3341110-by-ivnish

Compare with previous version

added 5 commits

• 15129e92...67f00609 - 4 commits from branch project:4.x
• 29e64665 - Merge upstream changes.

Compare with previous version

merged