Merge "If Pinned Shortcuts aren't available, then check for pinned shortcuts by id/package name" into main