Merge pull request #8024 from lodr/bug-833785-no-wifi-total

Bug 833785 - Including Wi-Fi usage in settings
Cause r+(cherry picked from commit facea722d594db6312fd4e8fe193ab2265da5d39)
(cherry picked from commit 7d1761cad3d82f1d99af05b1c3282cab9e9ec34a)