Move peek out of LN
Fixes, AD, LN, Peek can not be enabled all at once
ProximityWake : Add support for checking proximity when waking device [2/2]

Change-Id: I5e584da2a6c48da88639706f6df50a96fd1be3b6

Conflicts:
	res/values/kang_strings.xml
Settings: IME animations (2/3)

Destiled from here:
https://gerrit.omnirom.org/#/c/4249/32

PS2: something

Change-Id: I7a8135818c57929b612f4fcccdc425a49b72ae59

Conflicts:
	res/values/arrays_aicp.xml
	res/values/strings_aicp.xml
	res/xml/aicp_display_animations_settings.xml

Conflicts:
	res/menu/ram_bar_settings.xml
	res/values/liquid_strings.xml

Conflicts:
	src/com/android/settings/liquid/StatusBarColor.java

Conflicts:
	res/values/liquid_arrays.xml
	res/values/liquid_strings.xml
	res/xml/display_settings.xml

Conflicts:
	res/xml/display_settings.xml