Update to support audio/video toggle (not yet in skyway)