Fix black screen when transfer to monitor
Fix black screen - Code review fixes
Merged with master
Merge branch 'master' into chat-with-no-requirejs
Monitor updates integrated