Merge "Wait for server to be active in test_device_tagging"