Merge changes from topic "presubmit-am-2c53fb43bdab4e97b09f15ae0a56fa78" into sc-mainline-prod

* changes:
  [automerge] DO NOT MERGE: SurfaceControl: Ensure unused fields are zeroed 2p: 34fe38b0c7
  DO NOT MERGE: SurfaceControl: Ensure unused fields are zeroed