Merge "ScreenDecorations: Fix stuck / delayed rotations (second try)"