Merge "SF: Allow triple buffering on values above 3" am: c1abd73247
am: f03f46edd7

Change-Id: I62cf35bac2738625ea9a125c8fd22854cba8ebb6