Homogenize folder and device state to 'Up to Date' (fixes #1042)