Merge "Revert "Activate hot plugged device"" into main