Merge "Move sharedPreferences to DE directory"