Merge "Partial fix for jumping freeform windows" into nyc-dev