Merge branch 'devel/master' into devel/graphics

Change-Id: Ia4b90e49af7ce16a94a245c83677522cfb728aa5

diff --cc automated-tests/src/dali/dali-test-suite-utils/test-graphics-buffer.cpp
index fb06c3dc9167835d46dcbee1be1189d861daf23b,d8a1b1a668aafe85bcbe8d679dac5a19abeaf929..21eecf414b6418f124c551ed09f68f1bd1f10528
--- 1/automated-tests/src/dali/dali-test-suite-utils/test-graphics-buffer.cpp
--- 2/automated-tests/src/dali/dali-test-suite-utils/test-graphics-buffer.cpp
+++ b/automated-tests/src/dali/dali-test-suite-utils/test-graphics-buffer.cpp
@@@ -87,8 -87,7 +87,8 @@@ void TestGraphicsBuffer::BindAsUniformB
    Graphics::UniformBlockInfo uboInfo{};
    reflection->GetUniformBlock(0, uboInfo);
  
-   auto offset = uboBinding.offset;
-   auto* data = memory.data() + offset;
 -  auto* data = memory.data();
++  auto  offset = uboBinding.offset;
++  auto* data   = memory.data() + offset;
  
    for(const auto& member : uboInfo.members)
    {

diff --cc dali/integration-api/scene.cpp
Simple merge

diff --cc dali/integration-api/scene.h
Simple merge

diff --cc dali/internal/event/common/scene-impl.cpp
Simple merge

diff --cc dali/internal/event/common/scene-impl.h
Simple merge