Fix lockscreen timeout and SMS security
Move Dark RootBox above RootBox Settings.
Merge remote-tracking branch 'awa/jb-mr1' into jb-mr1

Conflicts:
	res/xml/settings_headers.xml