Move backup/restore, fix dpi groups intialization and change backup name

Change-Id: Ie3a076f81032ca44463adcf6c95dd1cc83731eab

Conflicts:
	res/xml/hybrid_settings.xml