Merge "Issue a warning if SharedPreferences are corrupted"