Merge "Add subtitle support to VideoView." into klp-dev