Merge "SurfaceControl: Ensure unused fields are zeroed" into tm-dev