Issue #2370115 by Upchuk, nafsinvk, jibran: Clicking 'Add to shortcuts' adds shortcut multiple times (cherry picked from commit edfd5bbe)