Merge "Added WindowContainer.removeImmediately to support immediate removal"