Merge "fix a race in SF buffer management" into gingerbread