[ha][watcher] refactor to start accounting for building announcer mode, too