Cherry picked new ToDoContainer from UI branch.