Active display [squashed] (2/2)
by 0xD34D

Conflicts:
	res/layout/seek_bar_preference.xml
	res/values/djl_arrays.xml
	res/values/djl_strings.xml
	res/xml/user_interface_settings.xml

Change-Id: I3c8b9aacd60c9409e1d210a399d0541cd6019fad
Fix build
[2/2] Settings: Pimp up ActiveDisplay
Base part: https://gerrit.omnirom.org/#/c/2819/

Change-Id: I8abf7a3018e7e0168860861ac240975cd1f8a2b0
[2/2] Settings: Fix pimp up ActiveDisplay
Base part: https://gerrit.omnirom.org/#/c/3380/

Change-Id: Ief2aa6802ad25a86b49d06bab1b9e34140dc5db5