Merge "Ensure we mark windows as not seamlessly rotating when removing them." into pi-dev