Merge "GuidedStep: Fix addAsRoot() restoring problem" into mnc-ub-dev