Merge "umount /data/user/0 before umount /data" into rvc-dev