Fix state-restoration ordering of child controllers

Needs to be consistent with the original init method
Merge commit '9cff1b81f09243d799e869cf7c955b14f636e60f' into barz-master