[dali_2.0.5] Merge branch 'devel/master' 51/249451/1
authorDavid Steele <david.steele@samsung.com>
Fri, 11 Dec 2020 12:11:40 +0000 (12:11 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 11 Dec 2020 12:11:40 +0000 (12:11 +0000)
Change-Id: I67b897d980472ef8231773ef6b747e1c0c358272


Trivial merge