Bug 1056969 - New data/roaming alignment

Conflicts:
	apps/system/js/statusbar.js