Merge "Add and remove DeviceInitializer from whitelist"