UrfArbitrator: fix error in merge; only call create_hybris_device in timeout.

Signed-off-by: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>