Merge "Avoid unregistering the same receiver more than once." into tm-dev