Code review comment for lp://qastaging/~thomir-deactivatedaccount/unity/sc-integration-phase2

Thanks for the review Marco, I think we'll go ahead with how it is right now, since I don't want any more delays (so that we don't miss the 5.8 release for this change) and I'll make all those changes you suggested coupled with a few tweaks in the design as suggested by MPT in his review on the previous merge request, into a phase 3 branch. The only blocker for this branch is the freeze exception.