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

Change-Id: Ia6c596153082162fa21af5aa7e05263170fb4615