fix stop before new play
support for gatewayId