Merge "Merge all shapes/paths caches to PathCache" into jb-mr2-dev