Merge "Now for real unmount bind-mounts on top of /data"