Merge "Support for WindowContainer controllers and listeners"