Merge proposals dependent on lp://qastaging/~charlesk/indicator-datetime/lp-1306112-query-eds-less-frequently-if-load-is-heavy

1. lp-1306112-query-eds-less-frequently-if-load-is-heavy
2. Dependent merge proposals