Merge "Fix clock slightly upward in preview" into main