Merge "Disable AdvancedProtectionService on desktop" into main