Merge "Removed used of DisplayContent.getReadOnlyWindowList()"