Merge "Refactoring: two more calls for WindowState.setDisplayLayoutNeeded."