Merge "Protect /mnt/scratch from stale umount on userdebug"