Merge "Add methods for managing subtitle overlays in VideoView" into klp-dev