Merge "SF: Use std::string for layer names"