Merge "Add importance ring around conversation badge" into rvc-dev