Merge user specified devices correctly with default devices. Otherwise the user specified devices end up without permissions. Signed-off-by: David R. Jenni <david.r.jenni@gmail.com> Upstream-commit: c913c9921b7caa11e8500d2ebb4fa97303c876be Component: engine