Merge "Tune dragToFolder test so that it works with the new nav bar height" into tm-dev