Merge "Revert "deprecate replayClips""