Merge "Fix MediaStore_FilesTest failing with double insert." into rvc-dev