Merge "VideoView: Change showSubtitle() to get boolean parameter"