Merge "Make WindowState use config from WindowContainer"