Merge "Add tests for filepath operations on pending and trashed files" into rvc-dev