Merge "Fix bugs regarding clamping of numFrames variable."