Merge "sde: Add support for layer caching"