Merge "Clean up use of DisplayContent from WindowState."