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