Merge "Revert "Implement video plane layer""