- fix race condition where video share button doesn't show up somtimes when presenterShareOnly=true
Merge remote-tracking branch 'upstream/master'