Merge "Hook onUserUnlocked to verify no response packages" into sc-dev