Merge "[Multi-user] Make various backup settings be per-user"