Merge "Remove ScanFile after unlink for ROOT_UID" into rvc-dev