Merge "Resolve subtle but severe flickering in layer caching" into sc-dev