Merge "Use communication device callback and fix reinitialization routing" into main