Merge "Always use Shortcut Icon in conversation if available" into rvc-dev