Merge "WM: Support device-specific DisplayArea (4/n)"