Merge "Remove db rows after unlinking the file from ROOT_UID" into rvc-dev