Merge "Re-add StackWindowControllerTests#testRemoveContainer_deferRemoval."