Merge branch 'upstream' into feature_inline_media

Conflicts:
	res/layout/new_message_item.xml