Merge branch 'release-2.0'

web/react/components/channel_loader.jsx

@@ -95,6 +95,8 @@ class ChannelLoader extends React.Component {
 
         $(window).on('focus', function windowFocus() {
             AsyncClient.updateLastViewedAt();
+            ChannelStore.resetCounts(ChannelStore.getCurrentId());
+            ChannelStore.emitChange();
             window.isActive = true;
         });
 
@@ -185,4 +187,4 @@ ChannelLoader.propTypes = {
     intl: intlShape.isRequired
 };
 
-export default injectIntl(ChannelLoader);
+export default injectIntl(ChannelLoader);