Fixes for RC1 (#6376)

* PLT-6505 - Fixing z-index for post control menu

* PLT-6507 - Channel header icons not aligned

* PLT-6508 - Options popover issue on android

* PLT-6528 - Removing cross contamination on badge

* PLT-6535 - Aligning content in SSO buttons

* PLT-6509 - Aligning dropdown close icon

webapp/utils/utils.jsx

@@ -558,13 +558,13 @@ export function applyTheme(theme) {
 
     if (theme.mentionBj) {
         changeCss('.sidebar--left .nav-pills__unread-indicator, .app__body .new-messages__button div', 'background:' + theme.mentionBj);
-        changeCss('.sidebar--left .badge', 'background:' + theme.mentionBj + ' !important');
+        changeCss('.app__body .sidebar--left .badge', 'background:' + theme.mentionBj);
         changeCss('.multi-teams .team-sidebar .team-wrapper .team-container .team-btn .badge', 'background:' + theme.mentionBj + ' !important');
     }
 
     if (theme.mentionColor) {
         changeCss('.app__body .sidebar--left .nav-pills__unread-indicator, .app__body .new-messages__button div', 'color:' + theme.mentionColor);
-        changeCss('.app__body .sidebar--left .badge', 'color:' + theme.mentionColor + ' !important');
+        changeCss('.app__body .sidebar--left .badge', 'color:' + theme.mentionColor);
         changeCss('.app__body .multi-teams .team-sidebar .team-wrapper .team-container .team-btn .badge', 'color:' + theme.mentionColor + ' !important');
     }