Merge "Remove token invalid check for BufferSurfaceFrame" into sc-dev