Merge "Support updated rendering of conversation icons." into rvc-dev