Merge "File writer size estimation improvement" into gingerbread