This should have been included in the previous commit :-)
Fix handling our own screen preview
Fix going fullScreen when double clicking the main video