Merge "Fix the fallback logic for shortcut icons when icons are missing" into sc-v2-dev