Merge "Fix typo in Settings.BOOT_COUNT"