Merge "Annotate TaskKey#baseIntent as @NonNull to match platform" into sc-v2-dev