Merge "DO NOT MERGE: SurfaceControl: Ensure unused fields are zeroed" into sc-v2-dev