Merge "Fix MediaTimeProvider seek & time drift recovery issue" into klp-dev