Integrate stats into settings [2/3]

Change-Id: I20fef1f2e033dae8a7cde11663efcb4e06c5e89c

Conflicts:

	default.xml