Merge branch 'devel/master' into devel/graphics 62/256762/2
authorAdam Bialogonski <adam.b@samsung.com>
Tue, 13 Apr 2021 09:29:53 +0000 (10:29 +0100)
committerAdam Bialogonski <adam.b@samsung.com>
Tue, 13 Apr 2021 09:30:33 +0000 (10:30 +0100)
Change-Id: I463df1dd7bdc73045a561fe1dfd4fe39f8773268


Trivial merge