Merge "s/w rendered apps can now use n-buffering (n>2)"