Merge "Conversation inline controls redesign" into rvc-dev