Merge "[Multi-user] No-op refactor to move backup dirs and settings, which should be user-specific, to one class for each."
