Merge "Only generate date header when rendering is guaranteed"