Merge "ShortcutHelper v2: include feature in same dagger modules as v1" into main