Option to always show heads up in expanded mode [2/2]

Change-Id: Iae62e6d0e844974b29f90d48a1e4d976c42e5270

Conflicts:

	res/values/custom_strings.xml
	res/xml/heads_up_settings.xml