Merge "VideoView2: Copy closed caption related code inside of updatable" into pi-dev