Merge "Moved adding to display WindowList to DisplayContent"