Merge "Skip layers with protected contents from caching" into sc-dev