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

Change-Id: Ieb70c3d9bed1c63e24e0be0baf9b19a9f7e9e663