[DF-185] Fix Scene::Update after merge