Merge "Fix the issue to reconnect AVDs"