Merge "Add @NonNull to BackgroundThread methods" into main