Switch dividers to grey
Switch dividers to grey
Merge remote-tracking branch 'origin/cm-11.0' into cm-11.0

Conflicts:
	res/layout/quickmessage_content_dark.xml
	res/layout/quickmessage_content_light.xml