Merge "Zero out WiFi duration and power if ControllerActivityCounter is null" into sc-qpr1-dev