Merge "Refrain from overwriting shortcut icon with default icon" into rvc-qpr-dev