Survey Cadence and On-sky time in the surveys

In a meeting of the TVS Collaboration today, several questions came up:
(1) PSTN-055 indicates that the WFD cadence would be one observation in one filter followed by a break of 33 minutes and then another observation in another filter. PSTN-056 indicates that two 15 second snaps will be combined into one 30 second snap. Do both of these statements still stand? That is, will there be one 30 second snap in one filter followed by a break of 33 minutes and then a second 30 second snap in another filter? Or, is there just one snap of 30 seconds in one filter for each pointing for each day?
(2) I have previously understood from this forum that the average on-sky time each day will be 4.7 hours. Is this on-sky time only for the WFD survey with additional time allocated for the mini-surveys including the DDF? Or, on average is 4.7 hours the total of all observations for all surveys each day? I understand that this is the average and that some days will be longer and some shorter.