Merge "Change setPrimaryStorageUuid to handle it for the current user" into sc-dev