Merge "Add ClockOptionsProvider for more realistic previews."