Merge changes I5ef52fe3,I5d6ec6fd

* changes:
  SF Bounds caching 3/3: Use cached transforms and bounds
  SF Bounds caching 2/3: Compute and cache layer bounds during invalidate stage