Merge "Revert "Finish child sessions when verification/setPermission fa...""