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