Merge changes I2440a161,I3e478b11 into sc-dev

* changes:
  Fix initialization of snapshot SkImage instance
  Conditionally cache RenderEffect results