Merge "Direct Reply: Add back emoji button" into nyc-dev