Merge "Refactor VideoRender"