Merge "MediaTimeProvider support fixes" into klp-dev