Merge "Allow more APIs before write in static buffer mode"