Merge "Remove StackWindowController and StackWindowListener (46/n)"