Merge "Support for specifying orientation in WindowContainer"