Merge "Revert "Allow for solid color layers to start some candidate cached sets.""