Fixes issues caused by the merge with master. Fixes the simulcast conferences on chrome.