Merge changes Ia451b623,I1dd2c460

* changes:
  Switched WindowState to use WindowContainer for managing children
  Added WindowContainer and WindowContainerTest classes.