Merge "Prevent race condition when iterating over bound services"