Merge "Clean up conversation icon" into rvc-dev