Added more support to Screen Sharing