Merge "Revert "Direct Reply: Add back emoji button" This reverts commit 713fed9226a411d1ba83f925c10bc56fec4f2b70." into nyc-mr2-dev am: 3e3bb0d08f
am: 4bc6d41f10

Change-Id: I4951dd2f74d7d23b6b9bc4de7369dc745961174b