Merge "Fix bad state for clouddpc users" into main