Merge "Annotate ActivityStarter as @NonNull" into main