Merge "Fix so that windows again animate when moving."