Merge "remove multi-user and enterprise deprecated functions from DeviceState" into main