Issue #1252952 follow up, Move checkbox setting to the same spot where time is set, and don't show option on dates without time.
