Merge "Upsort important conversations above others" into rvc-dev