Merge "Make unregister receiver "sync"." into tm-dev