Merge "Don't send idle-maint trigger broadcast as ordered" into pi-dev