[automerger skipped] Merge "ScreenDecorations: Fix stuck / delayed rotations" into pi-dev am: 664dde335c
am: 84c0f646ff  -s ours

Change-Id: I771ba1e0f1c464f583cc20489cb4e944f94a95eb