Merge "Fix CalledFromWrongThreadException in MediaPlayer's subtitle support" into klp-dev