Merge "Ensure integrity of sim-settings backupfile with AtomicFile." into sc-dev