Merge "Don't crash trying to unregister a receiver twice." into sc-dev