Merge "Conditionally cache RenderEffect results" into sc-qpr1-dev