Merge "WM: Introduce DisplayArea (3/n)"