PLD: remove another circular import, add odk_viewer model init back