Merge "Re-add check for invalid device state" into main