Merge "Skip caching if any layer has protected contents" into sc-dev