Merge "Revert "Add logs to verify receiver is unregistered"" into sc-dev