Merge "Add some more @Nullable annotations" into sc-v2-dev