Merge "[CORD-3003] Make XOS GUI optional (enabled by default)"