Merge "Revert "Revert "Finish child sessions when verification/setPermi...""