Merge "Do not remove enumerate client immediately when user switches"