Merge "Add MediaTimeProvider to MediaPlayer" into klp-dev