Merge branch 'devel/master' into devel/graphics 65/256765/2
authorAdam Bialogonski <adam.b@samsung.com>
Tue, 13 Apr 2021 09:27:57 +0000 (10:27 +0100)
committerAdam Bialogonski <adam.b@samsung.com>
Tue, 13 Apr 2021 09:28:37 +0000 (10:28 +0100)
Change-Id: I2922904cdfc21559a37299521dfc92d4dbd84f1d


Trivial merge