Merge "Revert "ScreenDecorations: Fix stuck / delayed rotations""