Merge "Update WM display info when nonOverrideDisplayInfo changes"