Merge "VideoView2: Applying missing experimental code for enabling subtitle"