Added support for switching first video and picture