Merge "Add conversation-centric inline controls"