Merge "Fix deadlock when notifying emergency state change" into main