Merge "Revert "Increase SF buffer size before starting flicker tests""