Merge "Implement register/unregister emergency registration callback" into main