Merge "Fix aggressive caching of RenderNode snapshot" into sc-qpr1-dev