Merge "Conversations UX polish pass" into rvc-dev