Merge "Check if we need to Poll for devices after RegenerateUevents"