Merge branch 'develop' into GH-1969/plus-in-app-promo

app/panel/components/Panel.jsx

@@ -15,6 +15,7 @@ import React from 'react';
 import { NavLink } from 'react-router-dom';
 import Header from '../containers/HeaderContainer';
 import PromoModalContainer from '../../shared-components/PromoModal/PromoModalContainer';
+import { ThemeContext } from '../contexts/ThemeContext';
 import { DynamicUIPortContext } from '../contexts/DynamicUIPortContext';
 import { sendMessage } from '../utils/msg';
 import { setTheme } from '../utils/utils';