Merge changes I96c24390,I76ec7cd2

* changes:
  Uncache the active buffer slot last
  Stop using nullptr for GraphicBuffers in unit tests