Merge "Merge "ScreenDecor: Fix cutout overlay regression" into qt-dev am: 7a84eb8d am: 853e63df" into qt-r1-dev-plus-aosp