KAZOO-2608: maintain user then device order