Merge "[Multi-user] Clean up backup enabled initialization"