Merge changes I682a8054,I71a820a1

* changes:
  Header population cleanup
  Fix NPE that can occur on uiMode change if a group has a single child.