Merge "Fix jank on conversation screen" into rvc-dev