Merge "Increase frame history size when SF buffer queue size changes"