rename back to Lock screen

(cherry picked from commit 2f8b0eba756bc1a1324885a383fc77d3dc517588)

Conflicts:
	res/values/cr_strings.xml

(cherry picked from commit e3d79bc76d3742ef60565144be9edf6a4b87075d)

Conflicts:
	res/values/cr_strings.xml

(cherry picked from commit 00573c84887ccd4b95b2e2f2547bbc4116403b36)

Conflicts:
	res/values/cr_strings.xml

(cherry picked from commit 99e75001286c1c01461450eb1509176b2de81004)
(cherry picked from commit 6c148afb3112fa9087d437065264397409352383)
remove slim strings

(cherry picked from commit 870b42503d705f1071a12a0c65ce554190023aa6)

Conflicts:
	res/values/cr_strings.xml

(cherry picked from commit 733e7d9c6fe8c4cc93be649980db1c1c65b5a8a0)
(cherry picked from commit 608e51748fdd69aaa1461543ec84778572e0e7a9)
(cherry picked from commit a4c15e266a05945ccf3304b5608fd2f8da49ff83)
(cherry picked from commit 162bbb08060c65c81af8e944cf2cecafc8a799dc)

Conflicts:
	res/values/cr_strings.xml
rename Home and TRDS

(cherry picked from commit 58153ebea60d70bdcf75317feedd1e7761df6bff)
(cherry picked from commit 0021f17a27fadd7bb26004dd9a6761e004e5d8de)
(cherry picked from commit 14d0f65aadce17a6346e6d380398d4da29174b64)
(cherry picked from commit 45d1b56966b862906a35aba5d1cff37814e43619)
(cherry picked from commit 16fce916142576428c8422f8f90af9bfa8f97a54)

Conflicts:
	res/values/cr_strings.xml
	res/xml/settings_headers.xml
rename home 2

(cherry picked from commit dc9c0abb0de22f7714d15888832edcad48b0c074)
(cherry picked from commit ea5b7abe376496b55247eb82d004a9d2acae8c64)
(cherry picked from commit c2ce93a9d70d887d86f19b4704832a3e8fd0bf51)
(cherry picked from commit 1be5536863c8e8d0890652f283e2aadcc6929a78)
(cherry picked from commit d5afee029c45376f5b1055148cf2a921985a3ec0)
updated settings names

(cherry picked from commit 8ad665ad366a6b35962145fb984e64a897e291b6)
(cherry picked from commit 9614219a150dd3b56a3815b8ad1bc5d4148dc3ad)

Conflicts:
	res/values-en-rGB/strings.xml
	res/values/cm_strings.xml

(cherry picked from commit e2e8f47ba132f8a2ea5bb1cafe7232a9a1d4096a)

Conflicts:
	res/values/cm_strings.xml

(cherry picked from commit 2a2573fbe206e7041b5a68389127133b5ba3022a)
(cherry picked from commit 848c5689c2bd1e0d18cc1764ac2f6a2b0e7fef2c)
Derp
Derp

(cherry picked from commit 2e8fa1fcb09fdae8961af5a1dead6897b18d42d7)
(cherry picked from commit baf3284abb68cbfa71b92f127bf71cbbd91cc779)
(cherry picked from commit 871154e00645b7e24b48f34a4bec3b07d18e60dd)
(cherry picked from commit f3742d061274b8b020d1a558c6bad2db727ec4ef)
(cherry picked from commit 54d957d89f828a5d275c7b26ad76759ccedbb0c0)
updated settings names 2

(cherry picked from commit 96536734d40804fc415022c4b0ccc4e69032a8bf)
(cherry picked from commit 96166c3f4210f56ca547b24f96edd011465d3396)

Conflicts:
	res/values-en-rGB/strings.xml
	res/values/cm_strings.xml

(cherry picked from commit 03119c98e5906b09bdb398643e3eee7eca5926b1)
(cherry picked from commit d0f064f5d4a37b0a7f8d8b819319a534616c5e28)
(cherry picked from commit 8072712b564ce3de932d457aec560d1ea0d1a162)

Conflicts:
	res/values/cr_strings.xml
Add UB logo to about info screen

(cherry picked from commit 660bbec813749b1ae73975811ab94f75a9a2ce90)

Conflicts:
	res/xml/device_info_settings.xml
remove stats

(cherry picked from commit d11616187b10ce2180d12c7ecb84bcaddde4e3b0)
Phone Info Fix

(cherry picked from commit b3a3721c950ff28f5c26972d8fffcf5a0ac5c31e)

Conflicts:
	res/values/cm_strings.xml