Merge "surface_control: Add missing nullability annotations" into main