Merge "SF: Switch Layer::createClone to using the factory"