Notification behavior (2/2)

Change-Id: I9798a52e8a4686df152aacfbc61f522a44aab8ad

Conflicts:

	AndroidManifest.xml
	res/values/cm_arrays.xml
	res/values/cm_strings.xml