Merge "Don't take the conductor lock for syncing vibrations." into tm-dev