Fix state-restoration ordering of child controllers

Needs to be consistent with the original init method