Merge "Properly finish daemon init when initial USB scan complete"