Will we get feature parity for the newer v2 / Device Prep. type of OOBE?

Mainly the thing holding us back from going from Autopilot > Device Prep. is concern that users could end up pulling a new laptop out of the box and entering their personal account, or otherwise not going the "work or school" account route.