Merge "[automerger skipped] Increase frame history size when SF buffer queue size changes am: fe42efccdf -s ours" into udc-dev