Merge "VideoView2: Replace showSubtitle with setSubtitleEnabled"