screen share resume workaround & refactor