Merge "Remove timer sync thread from FileSystemPreferences"