Merge "Unmount bind-mounts on top of /data before unmounting /data"