CB-6976 Windows Universal apps