Merge "Remove usage of Texture::cleanup in PathCache" into mnc-dev