Derp

(cherry picked from commit 041bcd788cdf2c073ff55d084d6f3a43692cee9b)
(cherry picked from commit 52d1f9c0c559f94107c2e54218ebd1cc868b9b40)
(cherry picked from commit f007164fdab547df077ced2f8c09e21dc8037150)
(cherry picked from commit 153a2e82937380257d3ec18c86c107ca096d07a2)
(cherry picked from commit 5cc95835dae6df1a19c3586fa9e9f644882176b7)

Conflicts:
	res/xml/device_info_settings.xml

(cherry picked from commit 39509a20be06c9e4b0ca14f13283752a378f68c4)

Conflicts:
	res/xml/device_info_settings.xml