Merge \\"Direct Reply: Add back emoji button\\" into nyc-dev am: 3207d8f8a1
am: 778271cbaa

Change-Id: Idc41c40a00552a8e083784b41e4487dc90153c07