Merge changes I6cd9c4cb,I6ceef468 into sc-dev

* changes:
  Dropping SurfaceFrames from Drawing State
  Add isBuffer to SurfaceFrame