Revert "VideoScreen_2.1"

This reverts commit f9aa556b1b2fbcd0d46af1077723cf77d5814f05.
Revert "Revert "VideoScreen_2.1""

This reverts commit 8bb2869f70ed5b169ec9a1dde3b7b728c2b5b3e8.