Merge "Skip SOLID_COLOR layers from SF Caching" into tm-dev