Merge "Fix the issue the if primary provider is disabled by work admin, it...

Merge "Fix the issue the if primary provider is disabled by work admin, it should be removed from the settings' storage." into main