Issue #3379522 by finnsky, Gauravvvv, kostyashupenko, smustgrave, Chi: Revert broken flexbox after Branding component creation
(cherry picked from commit 8e56fd31)
Closes #3274419