Merge "ScreenDecor: Fix cutout overlay regression" into qt-dev am: 7a84eb8de0
am: 853e63df60

Change-Id: Ie5454668ae09a15f4bd066966d26731e861d063d