Merge "Adevice update integration test; keep symlinks" into main