Merge branch 'devel/master' into devel/graphics 04/256804/1
authorAdam Bialogonski <adam.b@samsung.com>
Tue, 13 Apr 2021 09:04:39 +0000 (10:04 +0100)
committerAdam Bialogonski <adam.b@samsung.com>
Tue, 13 Apr 2021 09:23:07 +0000 (10:23 +0100)
Change-Id: I0347ae3fa47740fafc1ddd077a67a2cc15e582b2


Trivial merge