Merge "Tune NotificationRouter wait strategy"