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