Merge "Test that moving files doesn't break adb remount" into main