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

Change-Id: I2301bbd603e09b70b7df09a6df95a8ec57d89611