Merge "Don't cache layers that explicitly disable dimming." into 24D1-dev