Merge branch 'devel/master' into devel/graphics

Change-Id: I51fef49392010ab166900229c74b05bb0520fcd3

diff --cc automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-buffer.cpp
index fb06c3d,d8a1b1a..21eecf4
--- 1/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-buffer.cpp
--- 2/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-buffer.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-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)
    {