Merge "Clean up after enabling per-window-input-rotation"