Merge "Add WindowContainer proto definitions"