Merge "Window magnification supports multi-display in systemUI"