Merge "Support enable window magnification without animation"