Issue #3379522 by finnsky, Gauravvvv, kostyashupenko, smustgrave, Chi: Revert broken flexbox after Branding component creation
mentioned in commit c754c4c0
mentioned in merge request !5064