Merge "WM: Refactor DisplayContent in preparation for DisplayArea (1/n)"