Merge "Add override and merged config to WindowContainer"