Fixed screensharing, moving changes from master