Merge "Introduced WindowContainer.hasContentToDisplay"