Merge "GuidedStepFragment: Fix addAsRoot restoring bug" into mnc-ub-dev