Merge "Remove erroneous precondition for null surface test" into sc-v2-dev