Merge "Fix bufferFormat if we're falling back to 8888" into main