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

Change-Id: Ia1753e322ce9c0f77bf728abb9124fcce8797e56