Merge "Statsd CTS: don't use screen state (cherry-pick)" into pi-dev