Merge "Make WindowContainer surfaces container layers by default."