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

Change-Id: I36e5613b5e950fb678c76359dd3c0d8a7df1541b