Merge "Add the missing call to write mInputToken in SurfacePackage to parcel"