Merge "VideoView: add addSubtitleSource" into klp-dev