Merge "Manage mode shouldn't block for other providers." into lmp-dev