Merge "Revert "display: Video Encoding not working""