Merge "Revert "Make WindowContainer surfaces container layers by default.""