Refs #7867 - Container wizard state refactor