Merge "Clean up misuse of wfTimestampOrNull()"