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

Change-Id: I2e69d816eeefeced322bdbf1465445a2fb65c2e8