Merge "Convert SurfaceControl parceling to SAFE_PARCEL"