Merge "Switch WindowContainer to use ConfigurationContainer"