Merge "Revert "Enable TripleBuffering on SF by default""