Merge "Adjust conversation layout paddings to match UX spec" into rvc-dev